From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 21 Mar 2013 19:29:16 +0000 (-0400)
Subject: messageTray: Take modal grabs for the context menu and notification boxpointer
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4290
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fdae613b145be2c9e73f2db95e1bd3867314330e;p=gnome-shell.git

messageTray: Take modal grabs for the context menu and notification boxpointer

As the context menu and notification boxpointer can only appear if we already
take a modal grab, grabFocus will have problematic results if the focus does
somehow change.

https://bugzilla.gnome.org/show_bug.cgi?id=698483
---

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 70ff6d2d1..c9e64e7f8 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1748,7 +1748,7 @@ const MessageTray = new Lang.Class({
         let [x, y, mask] = global.get_pointer();
         this._contextMenu.setPosition(Math.round(x), Math.round(y));
         this._grabHelper.grab({ actor: this._contextMenu.actor,
-                                grabFocus: true,
+                                modal: true,
                                 onUngrab: Lang.bind(this, function () {
                                     this._contextMenu.close(BoxPointer.PopupAnimation.FULL);
                                 })
@@ -2661,7 +2661,7 @@ const MessageTray = new Lang.Class({
         }
 
         this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
-                                grabFocus: true,
+                                modal: true,
                                 onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });
 
         this._summaryBoxPointer.actor.opacity = 0;